In an example, a method for correcting time-of-flight measurements includes receiving a plurality of time-of-flight measurements and determining whether the time-of-flight measurements relate to a strong signal client, a weak signal client, or a preferred signal client. If the time-of-flight measurements relate to a strong signal client or a weak signal client, the method determines whether the time-of-flight measurements constitute two distinct distributions. If the time-of-flight measurements constitute two distinct distributions, a mean value for each distribution is determined. If the mean values differ by a predetermined time delay attributable to automatic gain control processing, the time-of-flight measurements corresponding to the distribution having the lower mean value are used. If the mean values differ by less than the predetermined time delay attributable to automatic gain control processing, the time-of-flight measurements corresponding to both distributions are used.