Fix 1.1 compatibility