BHV-10817: Modify logic