- #39 property fix