fix npe on new pass