Fixing bug in conditional properties