Bug fix with soft refresh