fix 4.00.1 switch for short types