One more fix.  (Sorry, bad merge)