BS-6825
Fix without tests