Fix time out bug