Upgrade to web4thejob-3.6.0