Fix 41b support