#630 – not perfect, but good