Fixed issue #99