worker bugfix #2