maybe we need add a large timeout on this one. Seems to be causing failures on the server