Fixed 'Indirect modification of overloaded property' issue