Fixed completion bug