GP Connect issue 18