Warranty Fix for charts