issue #865 update