Added task to fix unloading.