WIP Fix for Solaris