oops, fix null reference