fixed broken shift state