Tested up to WP3.9