Fixing some * mask (replaced by mask)