Little update to work with the new debug
infos...