Fixed selection of default mandator