This note seemed a little lost. This is a quick solution but do we need to address this more thoroughly in this PR or in a later one?