fix creator/save/load