Fix up for 4.4