CommonPrefix fix