Fix/master/issue 7680

As discussed with Adrien Thebo: here are my changes for master to fix Issue #7680 and duplicates. All rspec tests pass following these changes.