Issue #871 done