Fix added to core http://core.trac.wordpress.org/changeset/26364