Oops, last patch was misplaced.  Now placed properly.