It's a partial fix that at least unbreaks most direct usage of this shortcut in simple scenarios. See also: #25