temporary fix for missing fields