Default property set fix