Fixed issue #2557