fixes to duplication