Fix awkward behavior
Update properties