Fix time out problems