fa and js fix