Fixed conditions to use the inherited condition field.