Merge "visualizer: fix sub-overflow"