Fix how pending status is tracked