Fix a PM pattern and make it work with octc prefix