Nuke shuttle fix.
Merge pull request #3546 from Segrain/master

Nuke shuttle fix.