In addition to previous commit: Convert distance value into float again
+ add comment to explain the uglyness