DRY 20-line repeated section
Merge pull request #444 from mk270/tva/tasks

DRY 20-line repeated section