Fix issue with current page cloning