Better fix for sun studio build