start implementing quickfix for properties as well