@christianv - check if we can remove the `?`