#19 fixed again after large_save implementation