Fixed mandatory values check.