bug fix on main.js after merge.