fix the mandatory bug introduced before :-)