this fixes the 1.7 issue that @jreback reported