r414: fixed a bug caused by the last commit