WIP - another fixup