Fix how status is determined