Another try to fix the build issue.