[nim, tunji] #31 Fixes saving issue