fix only_if block