Fixed small issue with blank fields