Export clash fixed