Fixed Autocompletion #185