LPS-35561 fix for properties