Revise from v1.3 by linzhw, see "fixedList.txt" for details