hotfix for nullpointers