Bug fixup.