BugFix: page-change caused incomplete cleanup bug