Improve last commit to debugging