Properties fix