Fixed issue #69