Fixed issue #70