fixed context expansion