jah/ei fix