fixed context, finalized fix of #8