fixed context name handling bug