Maybe fixed annoying bug.