Fix up take 2