[michael] Fixed a timing issue on a page switch