Fixed a bug where an empty value threw everything off