Fix issue #17