Fix the coordination bug