Feature/fix js error