Fixed NULL showing up