Fix very annoying problem!!!!