merge of Natalia - change rnib errors