Made gapi work.