Fix 4.5 code