Testing improved #34.