another go at #145