Finally fixed the Mobility Change issue