Holodeck exploit fix.
Merge pull request #3532 from Zuhayr/master

Holodeck exploit fix.