Issue 823 redundancy