This should fix weird behavior