Fix for Android / iOS toggle