little fix with switch