improved fix for suite dups