Fix 1.6.4 legacy support