Fix issue #4