seven commit fixed the debug issue