Fix Trebuchet branch error