fix up incorrect conditionals that caused zita bridge to be built unconditionally