src/shared/fend/input-utils updated #19