Cleaning up tasking bug