Fix for issue #302

Per discussion on the issue. Look OK?
That syntax is .... scary. Can we just use a regular if here?