Added dupe bit handling in non-data cases