Fix 0.17 support