[#86] Fix duplicate extras