STS-3599: Fix refresh issue.