Fix 61 with ext a fix for mobile