See #1031