CORE-1631, fixed timeout issue