With this change its still working fine on multiple devices.