fixed endpage states