Fixed BIG ISSUE + added timeout :)