ver. 2.4.2. Fix incorrect page switching