Debug Feature Fixing