another attempt at #32