This change should be suitable as a workaround for the Solaris x86