Page queue issue fix