Aplied the proposed modification from DIRMINA-948