fixed edge case with undefined property values