Move unmasking in proper place.