Fix 4.1- issue