Fixes import & export with new encryption