Baseline Dimension Justification

Is there a way to get baseline dimensions to justify over the end of each segment. In the below Screen-shot, my default baseline dimensions end up as in the top part. Below that I've manually re-aligned each baseline to be over the corresponding hole - to make it easier for the shop guys to read.

Is there a setting or option I am missing here.

Thanks!

Marshall

SolidworksDrawings And Detailing