Fixes #7061
Merge pull request #7067 from PsiOmegaDelta/TheGlassShuttle

Fixes #7061