Fix for builder tool