Fix null issue