Fix for autocomplete changes. Resolves #54