Fix for DIRMINA-999