Solve some problems in chart flow. Enhancement #124