fixed based on Rusty's info about GatewayProviderServiceOnSaving event handler