fixed annoying bug