See #940