fixed null -> "" issue