Fix annoying bug