Dirty fix save/load objects