JAWA index fix