Resolve issue RMS-52