Add a bit more debugging