Fix the js problem after merging