Fixed a bug with duplicate properties by name