fix property = null bug