Fix issue #5