ANALYZER-2143

[ANALYZER-2143] Fixes regression caused in Pie charts due to a previous fix for ANALYZER-1711.

This fix is the one described in JIRA as Proposal-1.