Debugging after last commit from dbusatto