Null values bug solved