hotfix: possible null dereferencing