Fixing timeout