Fix issues with shift.