fix up exceptional cases