@sjcorbett your fix is better; hadn't realised you had done it.  reverting mine.