Improved handling of passive workers