fix minor switching bug introduced by 07ea2e
Merge branch 'pr723'