Fixing client sub on prefixes