See #1352