Adding some more debug helping for #292