Fixed duplicate property bug