Both comments taken into account in the last commit.