Fixes ValidateOrigin