Fixing shortcut counts to work for n>2.