Fix to JS