Fix overlay malfunction on its removal