Resolved issue #856