Fix add property in some weird cases