Fix for shorthand problem