Another CommonPrefix fix