Ref issue #855