Unfix Issue #117.  Broke the shortcuts :(