Only where-option coinstraint; fix