Fixed save & load methods