Fix for required fields