Bugfixed: dynamic upstream check