Fix modal charts

Fixes: bug #1212140

Change-Id: I6431cd0fc240ef9916c84e706403ed3f85767e06
Merge "Fix modal charts"