Do we want another bug for this?