Improved PHP 5.4 + WP 3.6 compatibility