Add some more debugging, aaa