Fixes #15. No more duplicate references during conversions