Fix string join issue