Fixed resolve shortcut