js partially fixed