Fix issue on changing page