Support 1.7 as well