Fix the status bug