Fix weird behavior