still more fixing