Timeout not starting at right time bug. + new build