Fix mix to accept old or new nil values

Fix mix to accept old or new nil values #1900