Fix bug in fix #30

Switch to right control