Fixing bug with property values