Shortcut hack for #8