Fix forced refresh not working properly