Fixed Input bug