Fix the handler logic, there's no more _handler