fix for missing fields during decoding