HOTFIX: Remove ?. operator