Second attempt at fixing timeout problem