SHAWA: Patch 1.6

-Shift end bug fixed