Re-add distance class.