T188424 fix + formatting