See #922