TODO: Fix for WP 3.1