fix: completion errors. Fixes #384 and #381

[LeonardoMor]

This solution was proposed by @lasypig. I tested it and it works perfectly. We'll see it covers all of the community use cases.

[LeonardoMor]

Will submit later without merge commits.