bug fixes to full dispatch