BHV-1576: moving fix from app to framework