theo2: be nicer in 9.4d