Little change on shift.cpp, doesn't affect performance