I made a little mistake on manual merge. This commit solves it.