Fix: Bad check on mandatory parameters