r21538: this looks better...