Update properties logic fix