Correction to work with gatekeeper which don't send GK ID