Fixed live trades being redirected too early