Fix for OptionalInputs (Final)