See #1481