Fixes #6 - Fix possible object duplication