Fix for THR-598