Fixed tasking bug