Fix god mode
Merge pull request #1758 from bucketh3ad/god_mode

Fix god mode