Fix error inpull 1679