Fix up this implementation