Temp fix in properties