Handle blanks etc. more appropriately