Issue #2242691 by ryan.armstrong: Missed two instances.