— Fix issue for older devices