try to fix js bugs 2