Fix the worst bug