Workqueue fix