Fix issue RMS-59