Fix minor bug with duplicated props names