Fix for missing fields