Issue 871 task redundancy

Fixes #871