Fixed issue #2252