Fix double-input issue per Emilie