Fixed old DAP Handler for New Protocol