workaround for TESB-8360