Task duplication fix