OK, check other properties as well, both here and in #1927