fix not returning bug