Fixed issue #3