fixed mandatory bug