Fixed issue #8