another go at #460...