Resolved issue #853