1) Fixed issue #873