Added check for own properties as per request #4