Fix gapi key