Fix returning true even when status is false