fix for WP3.6