Bug 941213 - Updated patch to fix highlighting issue