Fix issue #113