minor fix due to bug that appear with null value