Fix for chartbeat as well as box rounding