Fixed issue #114