Fix issue; Add debug facility;