Issues #2315541 by DanChadwick: Fixed conditionality is broken by pagebreaks.