Added fix for dynamic task list changes