Fixed the bug removed the bloat of debg messages