fix up a bit