BZ 1089062 - get this to work on Solaris