Fixed issue #113