Fixed save and read problem