Yet more bugfix for handlers.