Fix: missing fields
Fix: strict mode paradise