Fixed issue #2