Properly fixed timeout issue