Fix completion bug