Fix for TESB-14495