fixed context save issue