Map conflict wrongly committed, this commit solves the problem