Done. I also added a special case for nulls.