Fixing WP class