Add a workaround the session cannot be saved

Fix #69