fix up setup