Improved warning fix.