See #667