Fixed: compatibility with other Task format