Fixes new instances not exporting instance id after first save (fixes #18)