See #341