See #1357