fixed issue of crash
Working in KM too