Added if-form.
Self-review plus test fix.