r4662 - fix bugs in import save