SONAR-3692 Really fix issue with property set