fix gapi