HOTFIX: remove ?. operator