Fix for empty fields