Fix for searching for existing builders