Fixed no input issue