Another shift fix