fix issue

fix issue 2048 cant be merged