Fix 1.9 backwards compatibility