fix for mainline builder