Fix worker graceful death