Bug fix due to important overriding JS code