Fixing required fields for Issa #324