Resolved issue #866