Mobile management fix