add property check, bug fix