Still not correctly avoiding duplicates

Haven't had the chance to entirely test it yet, frogs already went home I think..

Signed-off-by: Toon Schoenmakers <nighteyes1993@gmail.com>