context bug fix (that = this...or this = that)