fixed javascript order