Adding some debug to help track down #167 #187