Fixed for WP 3.6+