See #1347