fixed context problem