Finally fixed timeout