fixed timeout problem