Issue: js fix