fix for 1.7