Fix base handler.