bug fixes for worker