Fixed issue with objects being added twice.