Add debug output, take #2