Fix misssing handler implementation