r3508: fix the build