Repaired auto completion bug