2nd fix attempt