patch tinkering for 3.8