Added more debug info to catch bug