Fix/acp first time