Fix for issue #2

See issue #2