forgot to remove "|| null"