Fixes the duplication problem
Merge pull request #330 from terwey/CS-4720

Fixes the duplication problem