Fix to run 1.60