Fix gapi issue