Final bugfix for room refresh issue.