Fix use of wrong sub
Fixing it in the right place this time
Merge remote-tracking branch 'reosarevok-bitbucket/mbs-6169' into beta

* reosarevok-bitbucket/mbs-6169:
  Fixing it in the right place this time
  Fix use of wrong sub