[3.8] Fix builder