fix of worker behaviour