Fixed fuckup with null values