ADEN-115 More debugging