Fix issue #109