more fixing 2