Fix for god-mode-all (refs #30)