Debug Fix 2