fixed gapi