fixed current_page nil errors