Fix for TESB-13146