worker refactored fix fix