BS-8971
Fix refactor