Fix bug with blank insted nil