FIX: correct fields declaration