Another attempt at #72