restore additional cluster fix (improve failing job handling)