Fix for TESB-14211