2nd fix attemt