prevent duplicate entries v1.11.0