Fixed comm. with gapi