also fix the From input