Fixed issue #7.