Fix for WP