Issue #85 ,fixed a conflict in javascript