Fix issue with collected tasks