I will have a look - was legacy code (trying not to regress).