[MNG-5640] Better fix, that covers mojo scope too