Fix all the handler thing.