Fixed issue #103