force save fix issue #52