#83 Fix completion functionality