fixed issued with empty value