Fix to 1.7