Fixed bugs in shifter unit