Finally found the fix