#370 - Added some debug info which may help