fixing NULL