fix set null value
fix output