event shift fix