fixup a bit