Fix for builder