Had some issue with this in past, and this is the vanilla logic. Potentially an old CB change that's no longer needed.