solve js issues