Shift problem fixed