Tested on WP 4.1 + fix