Job reentrancy avoidance proposal

@odinserj Could you incorporate this change?