Fix expanding tasks