Fixing bug with properties