fix: will not be null anymore