Liked herpingdo's godmode bugfix, but I neatened it up.