Gatekeeper bugfix