Fix duplicate resolving