#114 - Fix crash related to saving on context