Fix for empty field bug (ht: Bransin Anderson)