bugfix: unmasking reinjected the new (i.e. nan) instead of the old values (this should have been caught by a test)