Fix the start listener