Fixed lswitch problem
Merge pull request #22 from mpath/fix_lswitches

Fixed lswitch problem