Trying to fix the WP75 issues