ISSUE_7: Fixed measuring tool