Fix weird behaviors