Fix issue #102