Resolved issue #822