See #1695