Fixes duplication and prepares for joaquim merge
0.11