Charts calculation fixed