JS BUG FIX