still fixes for MRS 6