fix up handler