improved handling of multiple jobs