issue #1591 (kind of)