added timeout fixes