Add debug info and Fix