Revert "Removed code that triggered refresh twice"

This reverts commit 5678997ac615c938b09759d57b89d077b97aa537.
Fixed bug with double refresh