See #1374