properties switch fix (again)