wp_list_pages & wp_list_categories CSS clash.

When working with these two functions, I’ve noticed that both current_page_item and current-cat are set when I access a category. I fixed this by adding “&& is_page()” on the if-check in the Walker_Page->start_el() function for adding current_page_item as seen here:
if ( $page->ID == $current_page && is_page())

Is there a better solution, or is this simply a bug in 2.1X?

Linus