Fixed a minor bug in Shorthand