Fixed a bug that required non-required fields