Re-fixed issue for required fields