Fix property shared problem