Better fix for Set breakage