Cleaned Debug patch