Add logging to track down timeout issue