How about this? (See attached patch.)