Moved oneside page numbering issue fix to class file