This fix is ugly, but it fixes (what seems to be) the last test failure on Solaris. Can anyone recommend any other workarounds? If not then please apply it - or desupport solaris! /Mads