fixed non js functionality