Fixing issue with empty value