Fix duplicate properties problem for good!