Changed handling of zeros and the mask specification