Fix to wp-837