fixed context overlapping