Fixed issue #2067