Step in order to fix multiple page support