XXX: proposed ELL-152 fix