Try to fix the build issue