Fix input issue