Some more fixing