Fix debug location for matched container