FIX: regression in autocomplete