oops. this should make 1.8.7 happier