Fixed annoying problem