Shortcuts - infinite looping bug fix