Fixing storage of whole context when only info is needed