Fixed not taking js_file into account