Make charts more robust