Fix for instrument distance calcs