Fixed issue #9