#370 - added some more debug on other places