Suggested fix

Suggested fix for issue #2