Fix 1.7.7 support