Fixed lswitch problem