Fixed issue with required fields