Fixed issue #6