Try to fix a refresh issue (part II).