more stuff for 3.8