fix npe!