fixed context composing and parsing