435322 Improved debug