After Export/Import full fix