Better fix for the linux compilation issue.