Forgot to return the handler return