Fix the annoying bug