Fix possible slow job