these are necessary in 1.7 and don't hurt here (might even prevent issues for some contexts, I guess)