Fixed issue #102