Fix completion handler management