Fixed issue #2079