Is the Config->Note check needed here at all?