Taks Completion Bug Fix