TODO: bugfix for progress status on fail