Fix debug issue