OCLM-2 Fixed saving subscription