fixed problem mainly with WP