Fix listener on connection + grammar