CGIV-553 even more debug