Fixing issue with pass shortcut