fixed nojs issues