bug fix: null pointer broken issue