TDLR-411 fix