Fixed issue #7