Fix/acp first time listener