Fix PR 1688. See comments there.