Fixed JS calls