Fix for issue #302

Per discussion on the issue. Look OK?