Fix #579 / MW 1.25 JobQueue

Restore MW 1.25 compliance