fix #691 (reopens #685)