Applied the patch submitted in DIRMINA-964