Patch leak with highlight stuff