gapi fixed