fix waiver() always return NULL

fix waiver() always return NULL #1091