New take on #157.