another go at #116