Fix up for 1.7.10