Mvp fix const issue