fixing NULL to be null