XCOMMONS-329: The job finished state is set too early