Finally managed to fix timeout issue