Bug with refreshing fixed