fix empty values, see c92a49dcf969267220d2afbf2a9fe7a8fc21d4b8