fixing issues with the worker