Minor speed up
Fix 1.7.10 support