This version may work.  Please test.