Really fix joining undefined value