Task Manager - With Closure Bug Fix