Fixes #6311
Merge pull request #6327 from PsiOmegaDelta/NinjaHack

Fixes #6311