not sure if this is a fix or a workaround, hence the warning, RT#10024