Added handling of blanks