Follow-up from the discussion in #247
Follow-up from the discussion in #247