bugfix: allow optional fields