Follow-up from #24.
Follow-up from #24.