See #695