fixed up context clip method