fixed bug with properties overriding